From e4e6cb87b2d6188b7ab1fe99e580ccd0fda1676c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 18 Oct 2016 09:59:42 -0400
Subject: [PATCH] Rename gtk-query-immodules to follow our binary naming scheme

Instead of gtk-query-immodules-4.0, lets call it gtk4-query-immodules,
to use the same prefix as all the other versioned binaries.
---
 docs/reference/gtk/Makefile.am                 |  4 ++--
 docs/reference/gtk/gtk-docs.sgml               |  2 +-
 ...odules-4.0.xml => gtk4-query-immodules.xml} | 18 +++++++++---------
 gtk/Makefile.am                                |  6 +++---
 modules/input/Makefile.am                      |  8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)
 rename docs/reference/gtk/{gtk-query-immodules-4.0.xml => gtk4-query-immodules.xml} (82%)

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 27afb34b16..4d317bb8ce 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -293,7 +293,7 @@ content_files =					\
 	gtk-builder-tool.xml			\
 	gtk-encode-symbolic-svg.xml		\
 	gtk-launch.xml				\
-	gtk-query-immodules-4.0.xml		\
+	gtk4-query-immodules.xml		\
 	gtk-query-settings.xml			\
 	gtk-update-icon-cache.xml		\
 	input-handling.xml			\
@@ -496,7 +496,7 @@ EXTRA_DIST += version.xml.in gtk4.types.in
 ########################################################################
 
 man_MANS = 				\
-	gtk-query-immodules-4.0.1	\
+	gtk4-query-immodules.1		\
 	gtk-update-icon-cache.1		\
 	gtk-encode-symbolic-svg.1	\
 	gtk-launch.1			\
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 5ad8250ec1..626ea7d90b 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -363,7 +363,7 @@
     <xi:include href="gtk4-demo-application.xml" />
     <xi:include href="gtk4-widget-factory.xml" />
     <xi:include href="gtk4-icon-browser.xml" />
-    <xi:include href="gtk-query-immodules-4.0.xml" />
+    <xi:include href="gtk4-query-immodules.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-builder-tool.xml" />
diff --git a/docs/reference/gtk/gtk-query-immodules-4.0.xml b/docs/reference/gtk/gtk4-query-immodules.xml
similarity index 82%
rename from docs/reference/gtk/gtk-query-immodules-4.0.xml
rename to docs/reference/gtk/gtk4-query-immodules.xml
index f184b5348c..59512f1c00 100644
--- a/docs/reference/gtk/gtk-query-immodules-4.0.xml
+++ b/docs/reference/gtk/gtk4-query-immodules.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
-<refentry id="gtk-query-immodules-4.0">
+<refentry id="gtk4-query-immodules">
 
 <refentryinfo>
-  <title>gtk-query-immodules-4.0</title>
+  <title>gtk4-query-immodules</title>
   <productname>GTK+</productname>
   <authorgroup>
     <author>
@@ -17,19 +17,19 @@
 </refentryinfo>
 
 <refmeta>
-  <refentrytitle>gtk-query-immodules-4.0</refentrytitle>
+  <refentrytitle>gtk4-query-immodules</refentrytitle>
   <manvolnum>1</manvolnum>
   <refmiscinfo class="manual">User Commands</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-  <refname>gtk-query-immodules-4.0</refname>
+  <refname>gtk4-query-immodules</refname>
   <refpurpose>Input method module registration utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gtk-query-immodules-4.0</command>
+<command>gtk4-query-immodules</command>
 <arg choice="opt">--update-cache</arg>
 <arg choice="opt" rep="repeat">MODULE</arg>
 </cmdsynopsis>
@@ -37,7 +37,7 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>gtk-query-immodules-4.0</command> collects information about loadable
+<command>gtk4-query-immodules</command> collects information about loadable
 input method modules for GTK+ and writes it to the default cache file
 location, or to <filename>stdout</filename>.
 </para>
@@ -51,8 +51,8 @@ may be absolute or relative paths.
 </para>
 
 <para>
-Normally, the output of <command>gtk-query-immodules-4.0</command> is written
-to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>,
+Normally, the output of <command>gtk4-query-immodules</command> is written
+to <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>,
 where GTK+ looks for it by default. If it is written to some other location,
 the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
 GTK+ at the file.
@@ -72,7 +72,7 @@ GTK+ at the file.
 <refsect1><title>Files</title>
 <variablelist>
   <varlistentry>
-    <term><filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename></term>
+    <term><filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename></term>
     <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
   </varlistentry>
 </variablelist>
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4d94114a72..92c2af2dee 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1552,15 +1552,15 @@ endif
 # Installed tools
 #
 bin_PROGRAMS = \
-	gtk-query-immodules-4.0	\
+	gtk4-query-immodules	\
 	gtk-update-icon-cache \
 	gtk-encode-symbolic-svg \
 	gtk-builder-tool \
 	gtk-query-settings \
 	gtk-launch
 
-gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
-gtk_query_immodules_4_0_LDADD = 		\
+gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
+gtk4_query_immodules_LDADD = 		\
 	libgtk-4.la				\
 	$(top_builddir)/gdk/libgdk-4.la		\
 	$(top_builddir)/gsk/libgsk-4.la		\
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index eb73699640..0388c1fe72 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -209,14 +209,14 @@ install-data-hook:
 	$(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
 	  echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
-	  echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
-	  $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
+	  echo "$(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+	  $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
 	else \
 	  echo "***" ; \
 	  echo "*** Warning: immodules.cache not built" ; \
 	  echo "***" ; \
 	  echo "*** Generate this file manually on host" ; \
-	  echo "*** system using gtk-query-immodules-4.0" ; \
+	  echo "*** system using gtk4-query-immodules" ; \
 	  echo "***" ; \
         fi
 
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES =				\
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-	$(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
+	$(AM_V_GEN) $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
 
 EXTRA_DIST += README.multipress
 
-- 
2.30.2